[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: I3d56a66613cb0b2a6b187f9be672d9b03f5385a1
This commit is contained in: