[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-qpr1-dev am: 32e61bbeb7
-s ours am: e3f61dcf22
-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/+/15715977
Change-Id: I849ba40997a4726261da07aaa552e45682d75dd5
This commit is contained in: