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

Change-Id: I98789b25aeb57c784e555f6685ac5232f3f37b8c