Merge "[SB] Invalidate battery drawable on shield change; dump more info."...

Merge "[SB] Invalidate battery drawable on shield change; dump more info." into udc-qpr-dev am: f4464430

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



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