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

Change-Id: I7e23b87e756eadc85024752b1123f7dbad951830