Make sure spaces in CC license shortnames are handled correctly

Bug: T78433
Change-Id: I3973a2b18f43c11d8a506bbbaefa7fa675ee82fb
Merge "Make sure spaces in CC license shortnames are handled correctly"