Merge "Fixed OneTimeListener so AUTOFILL_SAVE_UI metric is properly saved."