[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069b4 am: f6aa7b8d8f
am: 8acb456949 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9934307cef63a331bb1fad3ba4fddee11393d98