Merge "Fix concurrency issue with BatteryUsageStats" am: 587eef25c9 am: e855d9f17e

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

Change-Id: I5d98a075c1faca7e8cf3c1dfb673da9854114bbf