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

Change-Id: I2683b91687b579e0bc137c829676b40666fac60e