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

Change-Id: I1a786540685307d60ff7bf2393a1b781d55e05f2