Merge "Snap for 8954189 from bbcaaacdadb8ea3c50466287db02466023ce9bea to androidx-activity-release" into androidx-activity-release