Merge "Autofill sample: Fixed CustomVirtualView issues. am: 85a44dc0 am: 71083393 am: 50cf0ce5" into oc-mr1-dev-plus-aosp