[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: f34b5fe6 -s ours am: 839c0a94 -s ours am: b71cc368 -s ours

am skip reason: contains skip directive

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



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