[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: b55dab3c -s ours am: 0e3f2e16 -s ours am: 0ac0d46c -s ours am: 4ce3088d -s ours am: 0c2ec14c -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: I1519da0b5da22005117f74add1aecb77903b74ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>