Merge "Be more thorough and correct about updating METADATA when regenerating." into main am: b9cabd0009

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

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