[automerger skipped] Merge "Revert "DO NOT MERGE CTS: Test column name with spaces"" into oreo-cts-dev am: 740d5b8cb8 -s ours
am skip reason: subject contains skip directive

Change-Id: I98ce7ba9c1505171da0c2278321018c9054b67d1