RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
am: 0e66ea6f32

Change-Id: I111fcc77d1e0c8b8065f5476fc2a0e75bf88f2a2