Merge "fix VtsHalGraphicsComposerV2_2TargetTest timeout failed" am: 81c9e603ea

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

Change-Id: Ief5601ad2311b6e24f15167859c1bbec251988df