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

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

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