Merge "composer: 2.4: vts: do not try to delay a config change outside a group" into sc-dev am: a7c8c514d4 am: ce6fd284c5

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

Change-Id: Ie7e1d94fcee1bf15a815169645cbdae51076ce80