Fix for Adding delay to testUnlock

On our devices, we have noticed that the time of printing test log is delayed by AOD.
On the host side, the time of getting logcat is too fast, resulting in a test case failure.
Hence, a delay has been added to address this the testUnlock failure.

Nougat has same issue which we fixed, making appropriate changes to Marshmallow.

b/62075150

Change-Id: I0fa10d85348da16e8c04828856961dca3f08a30c
Signed-off-by: Raj Mamadgi <r.mamadgi@samsung.com>