Merge "Refactor PropertyInvalidatedCache locks" into tm-qpr-dev am: ab5c609a am: 21085953

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



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