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

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

Change-Id: I7a4c8d9562c218d128e7b679c67c54c4cda0fd87