Merge "Dismiss lock screen when TrustAgent and bypass" into qt-r1-dev
am: f4a7a80514

Change-Id: I38e6db3055ff5603be3292b3dc3b4291342b69e9