[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: 0481a6494f

Change-Id: If53d18f6c18e8d3c851ad156a8116af4eadec555