[automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8
-s ours
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785
Change-Id: Iea5aafb8e04dfbed3c9d3d132508161c31bbecc1
This commit is contained in: