Merge "Update Mapper4 SetBadMetadata VTS test for optional metadata" am: 40800aa0cb am: 1b275ca7a0 am: a6b1ce227f

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

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