[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: 82b0cb14 -s ours am: 3098b581 -s ours

am skip reason: contains skip directive

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



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