[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 skip reason: subject contains skip directive

Change-Id: I046483ec092ef5b4bbc9f736184d328f954974c7