Fix LockScreen Settings on phones.

Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807
7 files changed