Merge "Snap for 6940384 from 513926fc07f451c58e0c346a9c214018eca858fd to androidx-autofill-release" into androidx-autofill-release