[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069b4 am: f6aa7b8d8f am: 8acb456949 -s ours am: fd58ea607e -s ours am: 0b712aaf6e am: e601fa8901
am: d8f7098a7e

Change-Id: I178ee719302bb75f7b0d3a817a4a9f289cb0165d