Merge "Fix concurrency issue in PropertyInvalidatedCache" into tm-qpr-dev am: a770767c

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



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