Fix GKI task release twice issue am: 5afe78052c am: ecec2165b9
am: 04c0a5dc7b

Change-Id: I6ec3e6467361d5c60195c5072ccda0f180decae0