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: Ic9149c0ad86e358a119d680f58023f4c4e819451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>