Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae am: 8ae0f1a438
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534 Change-Id: If8e4a3bd9eced2d5edbd47b5d5cad081684565bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: