[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into tm-dev am: 95d0954659 am: 0817af850c -s ours

am skip reason: Merged-In I11901755ec430c6e3145def9d67e4e63cda00806 with SHA-1 3e34d5744d is already in history

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

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