Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev am: 9c39783771
am: b9a44a9130
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745374 Change-Id: I240b05be141d48c6137561f3e300bd5deb4ff45a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: