[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

Change-Id: I6456bb9766d9c14fcd5beb3c69b24ced02605ed8