Merge "Merge "Hide keyguard bottom area when SHADE_LOCKED" into qt-dev am: e05421a8f3 am: f535c5cbd5" into qt-r1-dev-plus-aosp
am: 4336f71ff2

Change-Id: I8219de1f0b4b34d11d36edd59c53437fcccd83f2