Merge changes from topic 'smooth_unlock' into nyc-mr1-dev

* changes:
  Keyguard: Improve trusted unlock while occluded
  Keyguard: Refactoring for improving trusted unlock while occluded

diff --cc packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
Simple merge

diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge

diff --cc services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
Simple merge