Merge "platform: msm_shared: fix DSI phy contention detection programming"