Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev am: 9a293a71

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



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