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

Change-Id: I5070b97a015d664b13dbba499889a7f1374d05a0