Merge "Do not let device sleep after successful auth" into qt-r1-dev am: 972793ea20
am: d050a6b90d

Change-Id: I902a851c618f16869b81e4ac6c98917dc79d1296