Merge "Hide keyguard bottom area when SHADE_LOCKED" into qt-dev
am: e05421a8f3

Change-Id: I4c78399da05ffc68031072fbccf7267c594fbc94