[automerger skipped] Merge "Refactor battery usage page contollers interaction...

[automerger skipped] Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a71 am: 9feaa3d8 -s ours

am skip reason: Merged-In Ib23b338fe3946e68ff73a372342ec5d86494c566 with SHA-1 f5ea50e2 is already in history

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



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