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

Change-Id: Ieee0c13c03e957d626632eb257a5bb7e972213b7