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

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

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

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