[automerger skipped] Merge "vts: VtsHalGraphicsMapperV2_1TargetTest fixup's" am: 007c8457ec am: c1d9cd790f -s ours

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

Change-Id: I85b79954e4a2cabb899fde26eae6907fd88e74cf