[automerger skipped] Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069 am: f6aa7b8d am: 8acb4569 -s ours am: fd58ea60 -s ours am: 0b712aaf am: e601fa89 am: 97a4be88
am: 497cbdf0 -s ours
am skip reason: subject contains skip directive

Change-Id: Idfa04f104e6062f37f2f2f9ceea7a079b9df41e4