cm: Allow devices to set the GMS client id

Change-Id: I6fdf3817a292ac64291e8f9506eddd7d33059344
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2