Merge "Snap for 11023378 from 71dbbe257465d24e698ffc3a8a9d0ae7a4c9f630 to androidx-wear-wear-tooling-preview-release" into androidx-wear-wear-tooling-preview-release