[automerger skipped] Merge "Check for NLS service intent filter when rebinding services" into sc-dev am: ac23a586fa am: b1a035a8d4 am: b1f9d1aa14 am: 93d6b4f328 am: 35255d3ebb -s ours am: 2dfe01a8e6 -s ours am: 8f67a949e7 -s ours

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

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

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