[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257 am: bba6744ff4 -s ours am: 2ccbb35723 -s ours am: 79c2faf372 am: e2a8e18494
am: 5d890bf01d

Change-Id: I1885ce5b328588bf78e710ee998092724cf81e4e