[automerger skipped] Add gServiceSidMap. am: 3faf64b2dc
am: 3ab619c3a6 -s ours
am skip reason: change_id I4e5821d91ea694f86911218c23e68fcb987daaf9 with SHA1 ca016f9ac4 is in history

Change-Id: I7ade03508bb563a66f4c0c8e65bfccb4215cf251