[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

Change-Id: If4209781fdbac2dcc28cc36d2064b74e59ac7fe6