Merge "Fix for Adding delay to testUnlock" into marshmallow-cts-dev
am: cb32fa09ad  -s ours

Change-Id: Ieac91a9e5b871a48cf1c909b353f95677cd9cb19