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