[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: 67f39e52 -s ours

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

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



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