[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service intent...

[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service intent filter when rebinding services" am: a66d725c -s ours am: 35a4fcb9 -s ours

am skip reason: contains skip directive

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



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