Merge "Merge "Hide keyguard bottom area when SHADE_LOCKED" into qt-dev am: e05421a8 am: f535c5cb" into qt-r1-dev-plus-aosp