[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: e9e40ac5b5 -s ours am: 0ea77a83de -s ours am: 80fd9ab6c7 -s ours am: 33e10b45e4 -s ours am: a702126cce -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: Idcac68cfcf72da923d498f8c5ad1effd4a6de360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>