Merge "Convert gsid to use the dynamic AIDL service infrastructure" am: bd3a3389d3

Change-Id: If795407a85a0865d10d22719117ee3b0b09bdc27