Merge "Updating gradle dependencies for beta2 autofill sample. am: 7c931def am: 515ab71d" into oc-dr1-dev-plus-aosp