[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
am: 497cbdf041 -s ours
am skip reason: subject contains skip directive

Change-Id: Idfa04f104e6062f37f2f2f9ceea7a079b9df41e4