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

Change-Id: I1b5454ac2258ce5b69fc8a00c7af29c1f6961291