Merge "Snap for 15827067 from 380880b3f9008012c0b724339ebe016254c4354b to androidx-appcompat-release" into androidx-appcompat-release