Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
am: 063cc34713

Change-Id: Ic856426092578e47418498de40e22aa484badb19