Revert^2 "Added Remove shortcut Dialog UI"

This reverts commit 969fe685e9f80139e6d15f8fcf02620c14d0b574.

Reason for revert: This CL is unlikely to be the culprit. ACA flagged this test failure as flaky

Change-Id: I4a3f4b2c04c08e7f8aca11d9d762603c596ab09d
8 files changed