Merge "fix VtsHalGraphicsComposerV2_2TargetTest timeout failed" am: 81c9e603ea am: f864ffeb60 am: f5d2e9f8b8 am: 9506712ee3

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

Change-Id: I91028f31c1f571e31ba47695c4401738a3625b87