This reverts commit 690b36903c.
Original patch created an inconsistency in show/dismiss
dialog callbacks.
Bug: 80268176
This reverts commit 690b36903c.
Original patch created an inconsistency in show/dismiss
dialog callbacks.
Bug: 80268176