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

Change-Id: I146127732b2d7c5bba0c95c604c39a72d66236cb