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

Change-Id: I4d007ddc8a109e86dd44d8523968576ff29e10b8