Merge "[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service...

Merge "[automerger skipped] [DO NOT MERGE] Revert "Check for NLS service intent filter when rebinding services" am: ec277cad -s ours am: 6fcf979b -s ours" into udc-dev am: 8da8779a -s ours am: b88b7902 -s ours

am skip reason: contains skip directive

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



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