[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into tm-dev am: 95d0954659 am: 42e8f879b4 -s ours am: 0c9cc2ae97 -s ours am: e8e0260eb7 -s ours am: 266054a2b4 -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: I500b6838a3953397ff6b8ad55ba73259ea00f4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>