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