Merge "Revert "Check for NLS service intent filter when rebinding services"" into sc-dev am: 71b79f2941

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

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