ufs: Correct LSK upmerge changes

During LSK upmerge with tag lsk-v3.18-16.11-android ('commit
cc449563') some changes were not merged correctly causing
increased power consumption, correct those changes as per
feedback from UFS team.

Change-Id: I79d8147c7e772a1721da2b566f5bcb89a72659df
Signed-off-by: Imran Khan <kimran@codeaurora.org>