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

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

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