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

Change-Id: Ifaa9318d0103e8c0f75b13668026b7fd7ac53e14