Merge "Updates all samples outside of watch faces and wear notifications that use the new widget support library. am: 9f8a8aaa am: d0bbc94e" into oc-dr1-dev-plus-aosp