[automerger skipped] [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7 am: 4ccfb1d0aa am: efe1afbf93 am: 2adafa92bc  -s ours am: 205895e6e8  -s ours
am: 7bbb5456ed  -s ours

Change-Id: I149e0e27f9ecdef6bd82c3406fa7d0037f989980