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