[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 udc-dev am: 451155ec -s ours am: ba286e1b -s ours am: 68fb3817 -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/+/29139479



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