[automerger skipped] DO NOT MERGE: Allow OEMs to backport EXECUTE_APP_FUNCTIONS_TRUSTED before A16. am: 6a6eca858b -s ours

am skip reason: Merged-In I69f829007fa7466f2f7f7e0ba5dde0d26e770219 with SHA-1 ed96ffadcb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3558063

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