[automerger skipped] Merge "Include cache files from sdk data when cleaning...

[automerger skipped] Merge "Include cache files from sdk data when cleaning using freeCache" into tm-dev am: 88b6d17d am: 79f945c6 am: a0755bc3 -s ours

am skip reason: Merged-In Iea2c6e7d265cd097be34ee2e5299922c5269741f with SHA-1 a2198098 is already in history

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



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