Merge "Adding delay to testUnlock" into nougat-cts-dev
am: 7e117913a9

Change-Id: I05d95923d7e8f0043a7a442b886da61d124ccfa9