Merge "Remove phone specific shade controller from KeyguardViewMediator" into rvc-dev am: 14a64250e8 am: 1d2db397c7

Change-Id: I29e3d38d09ced2c107c25ee17aa56b9ab72d825b