Merge "Fix an NPE in BatteryService" into rvc-qpr-dev am: 2b534bde0e

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

Change-Id: I5086c0425b71654ac2115ce8f504ee65a5715766