[automerger skipped] [conflict] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 95b71ad87d am: 0876fa0374 am: fb7f905851 -s ours am: 62364de122 -s ours am: 82b0cb141a -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27422955

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