Merge "Check for NLS bind permission when rebinding services" into tm-dev am: 95d0954659

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

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