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

Change-Id: I29c19498018e9757f2261db3ada6a7f1c5e63de7