[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 skip reason: contains skip directive

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



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