Revert "SF: Fix deadlock during display hotplug"

This reverts commit c5995852a2754e6ece980db63a5effaaabcceab9.

Reason for revert: May be causing b/352809251

Bug: b/352809251
Change-Id: I650e757b84caae6960ec5c4d7912eabe31550492
2 files changed