Merge "Reprioritize AOD battery info" into sc-qpr1-dev am: fb26e84c5e

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

Change-Id: Iae6c825c79adaead8dea479ab6a843d04620565c