Merge "Fixed OneTimeListener so AUTOFILL_SAVE_UI metric is properly saved." into pi-dev am: 14c6b42b am: 90f3876f Change-Id: Ie04f2f823c5ae9de12aa37a441da2cb121c6cb3c