[automerger skipped] Merge "Revert "Check for NLS service intent filter when rebinding services"" into tm-qpr-dev am: b656cf6274 -s ours am: a98ef72506 -s ours am: 34d63c96b5 -s ours am: 50d2f3c94c -s ours

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

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

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