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

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



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