Merge "Add setEditChoicesBeforeSending to RemoteInput"