Merge "Snap for 7625019 from be43aa11bae522455ca26835a329fbc81f07603b to androidx-wear-wear-ongoing-release" into androidx-wear-wear-ongoing-release