Merge "Check for NLS service intent filter when rebinding services" into...

Merge "Check for NLS service intent filter when rebinding services" into sc-dev am: ac23a586 am: b1a035a8 am: b1f9d1aa am: 93d6b4f3

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



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