Merge "Snap for 10883127 from bb58e7b9ced64f1fe082bc3d32d7cb61a21e9f9f to androidx-hilt-release" into androidx-hilt-release