Merge changes from topic "New_IR94_AV_sync_solution" into tm-dev am: 1a003aa9 am: 7eb2f2f7

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



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