[automerger skipped] [conflict] RESTRICT AUTOMERGE Backport preventing BAL...

[automerger skipped] [conflict] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 95b71ad8 am: 0876fa03 am: fb7f9058 -s ours am: 62364de1 -s ours am: e04d0ace -s ours

am skip reason: contains skip directive

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



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