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

Change-Id: I25d94fe03626642ee8f456a78cfb502e1ca53b55