[automerger skipped] Merge "VT: Update payload value at runtime for SFR" am:...

[automerger skipped] Merge "VT: Update payload value at runtime for SFR" am: d6556012 am: 612f648a am: f35c8bbd -s ours

am skip reason: skipped by user lajos

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1256876fc2381a38d92c1b4f1dc8590b619fa356