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

[automerger skipped] Revert "Check for NLS service intent filter when rebinding services" am: ea7936a1 -s ours am: 31ad9ce9 -s ours am: 5068fa1f -s ours am: 79dcbfd7 -s ours

am skip reason: Merged-In I6ba585d123fbe88cbff2011b62f02774dd1efda5 with SHA-1 f6515cca is already in history. Merged-In was found from reverted change.

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



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