[automerger skipped] Merge "Check for NLS service intent filter when rebinding...

[automerger skipped] Merge "Check for NLS service intent filter when rebinding services" into udc-dev am: 8a03d05d am: 45bf94ab am: cdf037f1 -s ours

am skip reason: Merged-In I6ba585d123fbe88cbff2011b62f02774dd1efda5 with SHA-1 b5743e71 is already in history

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



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