Merge "Remove METADATA file" into main am: deab2a8ec7 am: bb1fa176ee

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3398679

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