This reverts commit e2379e8f90.
UFS G4 patchseries broke RB5 (sm8250). Reverting a minimal
set of patches to get the device booting again.
Bug: 146449535
Change-Id: If5ff418a051e9b22ab945723bc49705d7d682980
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>