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

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



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