Merge "Merge "Fixed the shadows on the lockscreen for bypass" into qt-r1-dev am: 9693956247" into qt-r1-dev-plus-aosp