Merge "Refactored KeyguardIndicationController and LockIcon."