Merge "Update Mapper4 SetBadMetadata VTS test for optional metadata" into tm-dev am: 325d853148 am: a8d0222e33 am: c7fceebf15 am: 687d38701e

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

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