[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
am: fab65bcfe5
am: 0051f1e3e9
-s ours
am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 2401ec4235
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822
Change-Id: I23b755bd071a96ea2f7e88e5a51049b0f4c270ef
This commit is contained in: