Merge "Fix high traffic PMS lockless methods" into tm-dev am: f3f7f92e am: a45f24d3

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



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