Merge "Prevent concurrent modification of battery history in tests" into udc-dev am: 5c6c582940 am: 0e94be6071
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21587265 Change-Id: Iebf4e43303ec11f33a40b725e68cc66151acc37d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: