[automerger skipped] Merge changes from topic "variable_latency_api" am:...

[automerger skipped] Merge changes from topic "variable_latency_api" am: dc2f403f am: 493331f2 am: 26de84f2 -s ours

am skip reason: Merged-In I517ad9c6aef14975c9e0a1a2703d1b17d638ea0e with SHA-1 50d7258f is already in history

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



Change-Id: I34dd2087c2c20fb7f1b9d8af8a0fa43a37ea0491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>