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

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

Change-Id: I2758867c87b1a9aaf1930bd585c185974036bcfc