Merge "Fixed OneTimeListener so AUTOFILL_SAVE_UI metric is properly saved." into pi-dev
am: 14c6b42b72

Change-Id: I0e6d4cfdb68c4915607bd65d408d8c2caed27dfb