Merge "[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service...

Merge "[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service intent filter when rebinding services" am: ec277cad -s ours am: 6fcf979b -s ours" into udc-dev am: 8da8779a -s ours

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

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



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