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

Change-Id: If9534450fac2cd9b328f105be73f53c92ab14dbd