Merge "Autofill sample: formatting. am: b6cb182b am: 9f21b1cc am: e0a8229f" into oc-mr1-dev-plus-aosp