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: I3783a972e931ae3c983c6ebe7c4f170bf5aba6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>