[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 tm-dev am: fa577670 -s ours am: 66ed4ca8 -s ours am: 57eca73b -s ours am: ebd3b888 -s ours am: 30529b7d -s ours am: c2c930ff -s ours

am skip reason: Merged-In I6ba585d123fbe88cbff2011b62f02774dd1efda5 with SHA-1 f6515cca is already in history. Merged-In was found from reverted change.

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



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