[automerger skipped] Merge "Fix concurrency issue with BatteryUsageStats" am:...

[automerger skipped] Merge "Fix concurrency issue with BatteryUsageStats" am: 587eef25 am: e855d9f1 am: fb37eaa5 am: 256a4651 -s ours

am skip reason: Merged-In Ifb03a32275dfbea172cd28309a42349d6dd4bcd5 with SHA-1 c635cfdd is already in history

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

Change-Id: I416e576b5e9304dc15ce89e4f357d1d8d0a3fe4a