[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into udc-dev am: be2c9642f4 am: 24ab0a9f93 -s ours

am skip reason: Merged-In I11901755ec430c6e3145def9d67e4e63cda00806 with SHA-1 24b13a64f9 is already in history

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

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