[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 skip reason: Change-Id I8bee7a0a6acecc1274d5acc0adb44c5dde8862e4 with SHA-1 cfea4924 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1507d8789b36c7cfae71811e6cf1d8dbbfd2bba1