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

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

Change-Id: I122947a6ab6001709cfb28f41c43cff90159adb3