Merge "Allow custom buttons in autofill UI" into oc-dev am: 249c4d709a
am: 489cef380a

Change-Id: I846ea7cbd275323cf65ed57d37a0acf13b010085