[automerger skipped] Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878 am: 0a11568b82 -s ours am: 1f1455a083 -s ours am: 819c36798c -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: I51947677794a267e9a4d906b3889e0beb2ef9e86
This commit is contained in: