[automerger skipped] RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options. am: f683c688d5 am: fc095efde0 am: e89348b54b -s ours am: 01787e9e4d -s ours am: fde3c88071 am: 422dd005cd
am: 7b18a9a650

Change-Id: I271cfc7c0c5f6afd25e336a6e07bb89b18013e72