[automerger skipped] Merge "Revert "Revert "Add gServiceSidMap.""" into pi-dev-plus-aosp
am: 2bc985e6b0 -s ours
am skip reason: change_id I771fa6bbeac0b9cbba5321881e191605b0e17e23 with SHA1 083a1d3732 is in history

Change-Id: Ic0884a44932e626371ff8aafe3b5401f8903a55c