Merge "Sample app: update autofillkeyboard sample app to work with the new API"