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

Change-Id: Ic77250f3a3ce14168cfe872da38b443f8792ed6b