cm: Allow devices to set the GMS client id

Change-Id: I6fdf3817a292ac64291e8f9506eddd7d33059344

cm: Actually add the custom clientidbase

Change-Id: I8105f2cd13c26777f59f1926f378f52c1152cd0d
merge changes from Slim kk4.4 into local branch