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

am skip reason: Merged-In Idfe4f21c2a51392457aa54caa3eaedaad77cb69a with SHA-1 c17d8088ed is already in history

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

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