rebase keyguard
Merge "rebase keyguard" into android-4.4