Merge "composer: 2.4: VTS using old value for parameter" into rvc-dev am: 32e3cd9a am: b80e6b3f

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

Change-Id: I28fdc63458f6b6063b3a0f61f2df52ce23dc07e3