Merge "Update Mapper4 SetBadMetadata VTS test for optional metadata" into tm-dev am: 325d853148 am: d258344140 am: bb14792ea2 am: 913d4a3e25

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

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