[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 216bbc2a2e -s ours am: 06cf16b862 am: 844fa00afb
am: a94619ab62

Change-Id: I03d194514820679db09bd78f953453ae7db4979b