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

Change-Id: I83961bb6bdffa90583d28e416a98cb0efd62fb32