Merge "Add dumpsys to KeyguardStatusViewController" into udc-qpr-dev