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

Change-Id: If26a2da70d853e4892a06a170f8d416ccf8f859e