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

[automerger skipped] Check for NLS service intent filter when rebinding services am: 0d7f70dc -s ours am: 14583a05 -s ours am: 80460fec -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: If3cd6fdeba06dc4594a5b32f710307329b247278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>