Merge "Update Mapper4 SetBadMetadata VTS test for optional metadata" into tm-dev am: 325d853148 am: a8d0222e33

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18327687

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