Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into udc-qpr-dev am: 7cac3f9f7d am: 5dd5c4874f

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

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