[automerger skipped] Merge "Fix thread safety issue on clearing cache" into...

[automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-qpr-dev am: 666deabe -s ours am: f18f915e -s ours

am skip reason: Change-Id I47d53a6d9d274bca4c78dbfd87e0097091b7b8cb with SHA-1 5e74205b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20c7ef5ce9f202d67466bc3daa0a004b0788950f