Merge "Add Battery Information page" into udc-qpr-dev am: 097cd12494

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

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