Merge "Update metadata target to the correct one" into main am: d79c96f7

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



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