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

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

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