[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: 97a4be8898

Change-Id: I9c227b94a6ff6d22e0982ff763369c245029db2b