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

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

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