Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev am: f8a2d069b4
am: f6aa7b8d8f

Change-Id: I466630af8385d6da164196f2420d040b2aa6e2ac