[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 tm-qpr-dev am: f58c295a -s ours am: bfba6fa2 -s ours am: fcdfe1cb -s ours am: 833e39fb -s ours

am skip reason: contains skip directive

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



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