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