Add gServiceSidMap.
am: 3faf64b2dc

Change-Id: Ia887cfa7139f6bab2332794ae6facdfef962a9db