Merge changes from topic "c2aidl-sepolicy" into main am: 3557bd86 am: 3f836996

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



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