Merge "Snap for 11805288 from c4ba4827341a1b0ea67500ff9ef5ede16207eb99 to androidx-appcompat-release" into androidx-appcompat-release