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

Merge "Merge changes from topic "New_IR94_AV_sync_solution" into tm-dev am: 1a003aa9 am: 857f7bf1" into tm-d1-dev-plus-aosp am: 0d98c600 am: 79589802

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



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