Merge "Convert gsid to use the dynamic AIDL service infrastructure" into rvc-dev