[automerger skipped] Merge "Revert "Check for NLS service intent filter when...

[automerger skipped] Merge "Revert "Check for NLS service intent filter when rebinding services"" into tm-qpr-dev am: b656cf62 -s ours am: a98ef725 -s ours

am skip reason: Merged-In Idfe4f21c2a51392457aa54caa3eaedaad77cb69a with SHA-1 c17d8088 is already in history

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



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