Merge "Added more metrics for Autofill:" into oc-mr1-dev am: d4f72ac3c4
am: b093daa296

Change-Id: Iae09ba2c6a082b87b74bd05320222955bde30dda