Merge "Merge "Revert "Synchronize cache-is-ready boolean with cache readiness."" into tm-dev am: 2dabd120 am: 778ecd97" into tm-d1-dev-plus-aosp am: 559dee03

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



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