Merge changes from topic "aidl-cap-hybrid-mode" into main am: 6018d613

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



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