Merge "VT: Update payload value at runtime for SFR" am: d65560123d am: 612f648ace

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/953060

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12cceb3f5ed96227a34865705bed9b5fb1443b09