Merge "Add more cleanups for METADATA files." into main am: a23cb0c04e am: 0a54e7c14d

Original change: https://android-review.googlesource.com/c/platform/development/+/3255987

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