Merge "Added BaseAdapter.setAutofillOptions()"