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

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

Change-Id: Iebd2db7d42cc4dbbfd344c855695a837f246e477