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: I03d36b4c05e30d00b0b52dbc6f7179afd512fc95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>