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

Change-Id: I32c7a57e2f40fa50cd27b5021312a0b0bb1999b9