[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 skip reason: Change-Id Ic6b91d6f4df9d5910ee4d05721f76e53e23a5c48 with SHA-1 91b3aeaeb3 is in history
Change-Id: Ib70a5291ed1efef36c7a9ef90c88fe81896d7acb
This commit is contained in: