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

[automerger skipped] Merge "Fix thread safety issue on clearing cache" into mainline-prod am: da6d70ff -s ours

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

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

Change-Id: I9c7d09d900c6afe33c882513bba9663e019b6d41