Merge "Prevent concurrent modification of battery history in tests" into...

Merge "Prevent concurrent modification of battery history in tests" into udc-dev am: 5c6c5829 am: 14d968bf

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



Change-Id: I2fb0ae6b4df70097289876b7ea7a87dab184eca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>