[automerger skipped] Merge "[DO NOT MERGE][Autofill Framework] Add in check for intent filter when setting/updating service" into udc-dev am: 178777eb56 -s ours

am skip reason: Merged-In I51c2e3788ac29ff4d6b86aa2a735ff2ea1463a77 with SHA-1 37c2b0112e is already in history

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

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