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

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

Change-Id: Ie5455acb843184e9cd6f1796da6143f7cd2c65db