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

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

Change-Id: Ie0e2b0be5d90cf1a40957a343a44489714446d0f