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

Change-Id: I46c2bb4e865c06a84245800dddb0fe018d8a52af