[automerger skipped] Merge "Fix an NPE in BatteryService" into rvc-qpr-dev am:...

[automerger skipped] Merge "Fix an NPE in BatteryService" into rvc-qpr-dev am: 2b534bde am: be26ce76 -s ours am: 7de717e3 -s ours

am skip reason: skip tag Change-Id Ic382d268f40a8ea31aaeedc7a85b6dc9b4e6c210 with SHA-1 780ca87a is already in history

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

Change-Id: I806ad4763031163b923e7887d288e479e004f161