Merge "Revert "Revert "Add gServiceSidMap.""" into pi-dev-plus-aosp