Merge "Autofill sample: formatting. am: b6cb182b am: 9f21b1cc am: e0a8229f" into oc-mr1-dev-plus-aosp am: 6ec177e9 Change-Id: I27f29e44bcc5209ecd4cbab38e8b8bb15ba9c152