Merge "Snap for 6940384 from 916ebd4a1d64a5cc1f6efab7e8680abb25f8dd6a to androidx-autofill-release" into androidx-autofill-release