[automerger skipped] Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef
am: 5e32dec664
-s ours am: 301bdd05d4
-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: Ie9e684d3cbc987f653f0026e9972a236d72e1036
This commit is contained in: