[automerger skipped] Merge "Clear cache shell commmand" into tm-dev am:...

[automerger skipped] Merge "Clear cache shell commmand" into tm-dev am: cb1813cd am: abb8ca4b am: c586e5ed -s ours am: 4d4a7437 -s ours

am skip reason: Merged-In Ibd61cdec64f51bbc84d6f0536aab877ce0725c6c with SHA-1 3f69af1e is already in history

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



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