[automerger skipped] Revert "Revert "Add gServiceSidMap.""
am: 083a1d3732 -s ours
am skip reason: change_id I771fa6bbeac0b9cbba5321881e191605b0e17e23 with SHA1 42bc6d5508 is in history

Change-Id: I2099c1c4d71199de99753c71abededa35a7d8ce5