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

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

Change-Id: Ided256d0a30fbbf07b1be2be23d897e4b0ab2c99