[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service intent filter when rebinding services" am: a66d725c68 -s ours am: 35a4fcb92b -s ours am: 138bffefc9 -s ours am: 77f3fbab6e -s ours

am skip reason: contains skip directive

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

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