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

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

Change-Id: If08d15473c7a44e79438fad91d7eca5e8918e5d8