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

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

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