Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict"