Merge "Convert VtsHalGraphicsComposerV2_2TargetTest to be parameterized test"