[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service intent filter when rebinding services" am: ec277cad99 -s ours am: 6fcf979b3a -s ours am: c2e73922b0 -s ours

am skip reason: contains skip directive

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

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