Merge "Autofill sample: Scaffolding for setting to add mock data. am: 1c511cbb am: a8638c77 am: 5daa2796" into oc-mr1-dev-plus-aosp am: 292cca2f Change-Id: I4f4fcc43288b80e5c93276fe8867d410dc8867e1