[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-qpr-dev am: 2e1d70ae -s ours am: c1ea8fab -s ours

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

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



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