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

Change-Id: Iba3e9f517e08cce3c6453ba3d0f6152552c23dbf