ville: move GSM permission up the inheritance chain

Change-Id: Id066459c38450a0371146813f2b9df1a84ee54ff
 Merge remote-tracking branch upstream/cm-10.1 into cm-10.1, (fixed conflicts)