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: ce6fd284 am: 3413d667

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

Change-Id: I4c087a777468b3ce1fa24f25f33fbc74a558303b