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

Merge changes from topic "c2aidl-sepolicy" into main am: 3557bd86 am: 3f836996 am: 39aa6888 am: 8c4b5fdf am: 644c40b1

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



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