Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev am: 5e687224bd
am: 2418109cf1

Change-Id: I3d8b0e3b785d8427dc6bca9168e7a4b7553cb22f