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

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

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