Revert "Accessibility shortcut improvement (2/n)"

This reverts commit 62ea99ca218bcf2f38616ae9eb43fdd9a8d3b3bd.

Reason for revert: Design Changed
Bug: 136293963

Change-Id: I38035eefd462677951e5d3a975c1790b8d291679
3 files changed