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

[automerger skipped] Merge "Check for NLS service intent filter when rebinding services" into tm-dev am: 2309b0a3 -s ours am: 02620b08 -s ours am: ac7d40fb -s ours am: 12fe3808 -s ours

am skip reason: Merged-In I6ba585d123fbe88cbff2011b62f02774dd1efda5 with SHA-1 f6515cca is already in history

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



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