[automerger skipped] Merge "Convert gsid to use the dynamic AIDL service...

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

am skip reason: Change-Id Ic6b91d6f4df9d5910ee4d05721f76e53e23a5c48 with SHA-1 23eaa3e4 is in history

Change-Id: Ifeed719f81d3c3dce6ce7abc5aaa1e52aabb8385