[automerger skipped] Revert "Check for NLS service intent filter when rebinding services" am: c17d8088ed -s ours am: cfed4799ae -s ours am: d0999a131f -s ours

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

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

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