[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 am: 17833034 am: 5d7acc92 -s ours am: fc9cf23e -s ours

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

Change-Id: I7c8ac81a04c24720146d84f58a76f18999ee13c6