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

Change-Id: I0b5686dda01e742f507865a2f3b806d012e9deb7