[automerger skipped] Check for NLS service intent filter when rebinding services am: 902de52521 -s ours am: 1509607724 -s ours

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

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

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