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

Change-Id: I1d439115cda694a84454314d2d10123d1754e89f