[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: d3e5c766a1 -s ours am: 703392e548
am: 9586551095

Change-Id: Ib692df9feaf41e5752b1f1e77d114fd3ab035c23