[automerger skipped] Merge "Convert gsid to use the dynamic AIDL service infrastructure" into rvc-dev am: 6a10fea457 am: 3a5402d9e2 -s ours am: 52a8346690 -s ours am: 93e8039e68 -s ours
am skip reason: Change-Id Ic6b91d6f4df9d5910ee4d05721f76e53e23a5c48 with SHA-1 91b3aeaeb3 is in history
Change-Id: Ia1413125c5b2f7420d05bed412e8670e28004006
This commit is contained in: