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

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

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

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

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