[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-dev am: 72edc588 -s ours am: 7f533d9d -s ours am: c3e7369d -s ours am: ed46a1b8 -s ours

am skip reason: contains skip directive

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



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