Merge "Check for NLS bind permission when rebinding services" into sc-dev am: 73a43831b1 am: d806b6ec65

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

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