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