Merge changes from topic "variable_latency_api" am: dc2f403f am: 493331f2

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



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