Merge changes from topic "libaudiohal_audiohalversion" am: c9c108d3ae

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

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