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

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



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