Merge "composer: 2.4: vts: do not try to delay a config change outside a...

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

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

Change-Id: I5beddfdf75a9aa39bffe8a53ac7f4236398bbd03