Merge "fix VtsHalGraphicsComposerV2_2TargetTest timeout failed" am: 81c9e603ea am: f864ffeb60

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

Change-Id: I96caa85615b0484af552d372dcb026e8d63a4d5b