Merge "Autofill sample: addresses comments on c/2372625 and c/2409408. am: 8ef88aac am: 23f3cbc2" into oc-dr1-dev-plus-aosp