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

Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76