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

Change-Id: I45612bcc3c17c560ebf52e267ee5624cb68efb39