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