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

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

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