Merge "Check for NLS service intent filter when rebinding services" into udc-dev am: 8a03d05ddc am: 45bf94ab4c

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

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