Merge changes from topic "fix-b-321651892-ihaladapterexample" into main am:...

Merge changes from topic "fix-b-321651892-ihaladapterexample" into main am: 5c7ce95d am: f9c9d980

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



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