[automerger skipped] Merge "[conflict] RESTRICT AUTOMERGE Backport preventing...

[automerger skipped] Merge "[conflict] RESTRICT AUTOMERGE Backport preventing BAL bypass via bound service am: 95b71ad8 am: 0876fa03" into tm-qpr-dev am: 72025bb3 -s ours am: 215d35b3 -s ours am: ab15e503 -s ours

am skip reason: contains skip directive

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



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