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

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



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