[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-qpr1-dev am: 374fbd3b -s ours am: 5e2263d6 -s ours am: e0765d9e -s ours am: ca148b11 -s ours am: f3823761 -s ours

am skip reason: contains skip directive

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



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