[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: Ia9e48a0899c7dd5bad4bf5508ab7cb453ac8e201