[automerger skipped] Merge "composer: fix 2.4 vts for multi-display" am:...

[automerger skipped] Merge "composer: fix 2.4 vts for multi-display" am: cd563ba0 am: a5d5bf13 am: 8661fe5a -s ours

am skip reason: Change-Id I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2 with SHA-1 be3fce41 is in history

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

Change-Id: I9ac61320cc7d4dc1553741004dacc273a37ebcfe