Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
am: 25ae29dfd5

Change-Id: If14315daa807243828d0c386638fad38811d99e0