[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: ec277cad -s ours am: eee8543a -s ours am: 0dc94b29 -s ours am: 79b34d4b -s ours am: e582de4f -s ours

am skip reason: contains skip directive

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



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