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

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

Change-Id: I10902351f21eb95e5fbfdbc721ab595bd76fb774