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

Change-Id: I8a03a1670ee8aceaa50b123f9b1201e9c4957fd7