[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 am: 3a5402d9 -s ours am: 52a83466 -s ours

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

Change-Id: Ib70a5291ed1efef36c7a9ef90c88fe81896d7acb