Merge "Fix concurrency in BATTERY_USAGE_STATS_* statsd atom generation" into...

Merge "Fix concurrency in BATTERY_USAGE_STATS_* statsd atom generation" into tm-qpr-dev am: 0995b708 am: adf6b818

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



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