[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: 6fcf979b -s ours am: c2e73922 -s ours

am skip reason: contains skip directive

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



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