Merge "Merge "Using Beta2 autofill APIs in autofill sample." into oc-dev am: 1b2ae683 am: 37523a96" into oc-dr1-dev-plus-aosp