Merge changes from topic "am-8cd339401d314806a4d787f969af6fbe" into pie-cts-dev

* changes:
  Merge changes from topic "am-6e846588ec5d49759933a1563376ee0c" into oreo-mr1-cts-dev am: 93e43f1a98
  [automerger skipped] Revert "DO NOT MERGE CTS: Test column name with spaces" am: 1f4a58b6d9 -s ours am: 28c65dc403 -s ours am skip reason: subject contains skip directive
  Revert "Strict SQLiteQueryBuilder needs to be stricter." am: 896ac37fdf am: ebcaae3d45