Merge "Check for NLS service intent filter when rebinding services" into sc-dev am: ac23a586fa

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

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