Merge "Reprioritize AOD battery info" into sc-qpr1-dev am: fb26e84c5e am: dc0c8db220
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15768206 Change-Id: I8ebfa906ba8728e6b09964d09b338e9382ceecc5
This commit is contained in: