Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev am: 73efdc96

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24220783



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