[automerger skipped] composer: fix 2.4 vts for multi-display am: 685b5e6049 -s ours

am skip reason: Merged-In I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2 with SHA-1 93de2043a8 is already in history

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

Change-Id: I8c5f9ed2a2eb53dc77f0f4c4047fb87621933f5a