pyramid: update systemprop to use our GSM-settings

Change-Id: I96ef3c58ac14a1e8fc6c967a558d4f2c9361b7e8
Merge "pyramid: update systemprop to use our GSM-settings" into jellybean