Merge changes from topic "New_IR94_AV_sync_solution" into tm-dev am: 1a003aa9 am: 857f7bf1

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



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