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

Change-Id: I821246f30a7dcd323abc5c8f8fe848662df002ee