Merge changes I42e7cc34,I83d9a25f into oreo-cts-dev

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