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

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

Change-Id: Iec10b0ba3c704bc6a7527d75771627efe6b024f1