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

Change-Id: I6c74a68eefe3b40e11eaabafdc9d3a73de0073bb