Merge "[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" into oreo-mr1-cts-dev am: e2d46caa62 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic8ecd8ec785afa6ea511429a89fe578ba0910a3e