[automerger skipped] Merge "Revert "Check for NLS service intent filter when...

[automerger skipped] Merge "Revert "Check for NLS service intent filter when rebinding services"" into sc-dev am: 71b79f29 am: f25f2262 am: 798a587d -s ours am: 4107a9dc -s ours

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

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



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