Fix GKI task release twice issue
am: 5afe78052c

Change-Id: I3fbe642fbd332a4df9432c9e35bd9d8b8950944c