Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
am: b32c05a36a

Change-Id: I69f9a67ae35a2f8e3ae9982531e391ea8a5b49e5