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

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

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

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



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