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

[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into tm-dev am: 95d09546 am: 42e8f879 -s ours am: 0c9cc2ae -s ours

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

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



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