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

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

Change-Id: I26f60d65c2c654d46515148bbbd62be82c05be3f