Merge "Snap for 8969950 from bbcaaacdadb8ea3c50466287db02466023ce9bea to androidx-annotation-release" into androidx-annotation-release