[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 udc-qpr-dev am: dbda2344 -s ours

am skip reason: contains skip directive

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



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