[automerger skipped] Merge "Check for NLS bind permission when rebinding...

[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into tm-qpr-dev am: 9d6e509a -s ours

am skip reason: Merged-In I11901755ec430c6e3145def9d67e4e63cda00806 with SHA-1 4d4224c1 is already in history

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



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