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

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

Change-Id: I21fa7173327b6438cfceffcd420f04103594c6f5