[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service intent filter when rebinding services" am: ec277cad99 -s ours am: eee8543a39 -s ours am: 0dc94b2928 -s ours am: 79b34d4b89 -s ours

am skip reason: contains skip directive

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

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