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

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

Change-Id: I3a9b63f3aa3b33d3e4a8508befeb646170a0cf29