Merge "Snap for 9111745 from bbcaaacdadb8ea3c50466287db02466023ce9bea to androidx-core-core-google-shortcuts-release" into androidx-core-core-google-shortcuts-release