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

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

Change-Id: I7c4ec823c0639ed3f502ae1cca6b6750cf24b30b