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

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



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