Merge "Merge "Autofill sample: Completed layout TODOs." into oc-dev am: 10e24fbe am: 72c16568 am: 30bfcc7c" into oc-mr1-dev-plus-aosp