Merge "Clean .intermediates for removing hashed subdir" into main am: 56f73040

Original change: https://android-review.googlesource.com/c/platform/build/+/3145901



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