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

Change-Id: If858ca2b6a386cd2408de09c7c46a239ce600bc4