Merge "Lock access to PowerStatsLogger data" into tm-qpr-dev am: 30c7e67d

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



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