Merge "Disable autofill while user setup is not completed." into oc-dev am: 3540463b74
am: d51bf85e6c

Change-Id: I5a55fa8fbedfdeb3721a9b0c1e0c24c3602f2bfd