[automerger skipped] Merge "[DO NOT MERGE][Autofill Framework] Add in check for intent filter when setting/updating service" into sc-qpr1-dev am: 374fbd3b20 -s ours am: 5e2263d6de -s ours am: e0765d9ef7 -s ours am: ca148b1190 -s ours am: f38237613d -s ours am: edc8f71a38 -s ours

am skip reason: contains skip directive

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

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