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

[automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-dev am: 5d559ac7 -s ours am: ef43403a -s ours am: d73610dc -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie81dd0428fb6a569a0c613369b74b8825f6058dd