Merge "Merge "Remove phone specific shade controller from KeyguardViewMediator" into rvc-dev am: 14a64250e8 am: 34ce0c319e" into rvc-d1-dev-plus-aosp