Merge "Snap for 8961310 from bbcaaacdadb8ea3c50466287db02466023ce9bea to androidx-appcompat-release" into androidx-appcompat-release