Merge "Snap for 5693012 from aee8d69fb786e31face83a02780ea8069447634d to androidx-jetifier-release" into androidx-jetifier-release