[automerger skipped] vts: VtsHalGraphicsMapperV2_1TargetTest fixup's am: 542eba4c03 -s ours am: f803675795 -s ours

am skip reason: Change-Id I6c1a67fc36dbc653ec2ada6a335d685d21e82800 with SHA-1 9894812dd1 is in history

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

Change-Id: Ia136d13b7c8910bfc4d9c01debd3653ac139fab3