Merge "Using Beta2 autofill APIs in autofill sample." into oc-dev
am: 1b2ae683b2

Change-Id: Idd4e7905962c054bbaa8b7b9cfe7ad1eb45584bc