Merge "Use ContactDisplayPreferencesStub when device is locked."
am: 4d6e108053

Change-Id: I1f0dc099c476ddb2e8baa412434aac4c9662d1be