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

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

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