Merge "[DO NOT MERGE][Autofill Framework] Add in check for intent filter when setting/updating service" into sc-dev