[automerger skipped] Merge "Revert "Check for NLS service intent filter when rebinding services"" into sc-dev am: 71b79f2941 am: f25f2262c1 am: 798a587d22 -s ours am: 4107a9dcfa -s ours am: 6cd2b45ea0 -s ours am: 0ff54fd95c -s ours am: 1ec634dd3c -s ours am: 05932da001 -s ours

am skip reason: Merged-In I1a56aa25aec1bc593303b2f7a3940e8c0eba6bb3 with SHA-1 ea7936a16e is already in history

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

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