Merge "Fix b/277880435: System battery settings app crash" into udc-dev am:...

Merge "Fix b/277880435: System battery settings app crash" into udc-dev am: 6ad5b9a5 am: 64899ed0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22609037



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