Merge "Merge "Show open padlock when keyguard is hidden" into qt-dev am:...
Merge "Merge "Show open padlock when keyguard is hidden" into qt-dev am: 063483c1 am: d357b49d" into qt-r1-dev-plus-aosp
am: ae68a6b0
Change-Id: Ied76bb4050e39aa9cbba8d5d7f0dd4f825f7c0d5