[automerger skipped] Merge "DynamicSystemService: Use IGsid which reference-counts the gsid service." am: 5d8d5f9af7 am: 0f2909389e am: 9b4c37be2c
am: d7a922e46a -s ours
am skip reason: change_id I6075d08ed16b86fe158a6045ad23d0867ae9b66c with SHA1 38f030dc76 is in history

Change-Id: I9fdd3a5bf5740fd06fd11ae8eb28603d566d9403