[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-dev am: 235ad9a1 -s ours am: 254d62af -s ours am: 7fc99452 -s ours am: e6a9eef6 -s ours

am skip reason: contains skip directive

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



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