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

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

Change-Id: I66d155d32a31aa777a20c749f95bd09a82b8a6fd