Merge "Made the drag down anywhere on lockscreen go to the shade locked am: 5f1fb46ed9 am: 1b47b53c35" into qt-qpr1-dev-plus-aosp