tree df8d1611d60cc68e69788af6d7f44705b464cfd7
parent 0c99e2b1c8bf19994b7218743892fcdd73bba55b
parent 36072e86efb1097b625b86f5d5baeb0e5f038bfa
author YUKAI HUNG <ykhung@google.com> 1632814219 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632814219 +0000

[automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef -s ours

am skip reason: Merged-In I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47 with SHA-1 ad346e12d5 is already in history

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

Change-Id: I176606ea2e056d6cb109fdf4dc03b2fe7ceffdcb