Merge "Fix the issue that makes GsiService::Cancel to block"
am: af1a6ad869

Change-Id: I3a7abde42efda39bb6ecfd72f00e51b9e9cf1372