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

[automerger skipped] Merge "Check for NLS service intent filter when rebinding services" into sc-dev am: ac23a586 am: b1a035a8 am: b1f9d1aa am: 93d6b4f3 am: 7197c27e -s ours am: 6c8279a6 -s ours am: 240aa128 -s ours

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

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



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