Merge "Keep Cache implementation for Android Auto" into main am: c50f74d7 am: cbc04d37

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



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