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

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

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