[automerger skipped] Add gServiceSidMap.
am: d7f8d2226f -s ours
am skip reason: SHA1 d7f8d2226f skipped by user smoreland

Change-Id: I302dc14579007ed2865f19e2a4feacb1fb658252