Merge changes I6b247672,I9ef52453 into oreo-cts-dev

* changes:
  RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter.
  DO NOT MERGE CTS: Test column name with spaces