Android p preview 2
Merge "Delete unmerged row on update conflict"