[automerger skipped] Merge "Convert gsid to use the dynamic AIDL service infrastructure" into rvc-dev am: 6a10fea457 -s ours

am skip reason: Change-Id Ic6b91d6f4df9d5910ee4d05721f76e53e23a5c48 with SHA-1 91b3aeaeb3 is in history

Change-Id: Idac8db20756ee92ad85d98471c1adf91911aa825