[automerger skipped] Merge "[DO NOT MERGE][Autofill Framework] Add in check for intent filter when setting/updating service" into sc-v2-dev am: 2443f0d8b3 -s ours am: b0641eae16 -s ours am: 4bbdae5840 -s ours

am skip reason: contains skip directive

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

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