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

Change-Id: I72af5f8c0cb287ca20b159e1af213198f056bfa0