[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: 2c00ea16c3

Change-Id: Ib0711f8988079041d1e20750c8e242f0414fc99e