Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db14809 am: 6890569c" into oc-dr1-dev-plus-aosp