[automerger skipped] Merge "Hide Camera background running time in the battery...

[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d3298 am: fab65bcf am: 0051f1e3 -s ours

am skip reason: Merged-In Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe with SHA-1 2401ec42 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: I23b755bd071a96ea2f7e88e5a51049b0f4c270ef