[automerger skipped] Merge "Port battery usage bug fixing cls from master to...

[automerger skipped] Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae am: 3588b515 -s ours

am skip reason: Merged-In Ice30508bc20b5de631efee0db0160fe6ad710dbb with SHA-1 65b63585 is already in history

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



Change-Id: I58c2aebe110f8a1f69f4e11ddaf35e6ef1673684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>