[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: 0a11568b -s ours am: 1f1455a0 -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: Ib4539cb29269aece1795e3bf43697389fb5a860f