Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev am: b1c1ae9517 am: 50df41af58 am: 7165cc134f am: c206be3301

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825

Change-Id: I8964b2b40aa84ddb48a49a46c6b0c8e1b4b4f293