[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: a9533dcd62 am: 84343cfa93 am: 060def8608 -s ours am: 232eaee57b -s ours am: 6b98ed38e5
am: bfd2ad60f7

Change-Id: I1e390c5e840c7f923c8f35ffb5fe10ea8cbe9624