Merge "Snap for 14721494 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-wear-watchface-release" into androidx-wear-watchface-release