ANDROID: fix merge issue in 5.4.22

ufs-mediatek.c ended up duplicating the ufs_mtk_apply_dev_quirks()
function, which caused build breaks.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia391fc93e7c5a54005e1c7df4280211b269000cd