Merge changes from topic "New_IR94_AV_sync_solution" into tm-dev am:...

Merge changes from topic "New_IR94_AV_sync_solution" into tm-dev am: 1a003aa9 am: 815681ac am: 174a211e am: 79dec272

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



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