Merge "Adding lock icon to FaceLockAreaView on lockscreen fixes 5394522"