[automerger skipped] Merge "Fixes a thread safety issue (a...

[automerger skipped] Merge "Fixes a thread safety issue (a time-of-check-time-of-use bug) in BatteryExternalStatsWorker that causes system_server crashes in VROS device." am: 75a97e48 am: e5ec5142 am: 2c9ef37f -s ours am: 5b8fcef6 -s ours am: 701519fb -s ours am: dbcb3548 -s ours

am skip reason: skipped by user dplotnikov

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



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