Merge "composer: 2.4: vts: Add missing COMPOSER_OVERLAY allocation flag" am: 283a876e5a am: 0bda60d835

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

Change-Id: I9759a8667e85c1702464efb4736dbeab352c9e6b