[automerger skipped] Merge "[DO NOT MERGE][Autofill Framework] Add in check...

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

am skip reason: contains skip directive

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



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