Merge "Snap for 11514708 from 113fbd1147747e1275addd0a462a59cdc63e0509 to androidx-wear-platform-release" into androidx-wear-platform-release