[automerger skipped] Revert "Fix the accessibility shortcut funtionaility."...

[automerger skipped] Revert "Fix the accessibility shortcut funtionaility." am: 00329792 am: 38c838f1 -s ours

am skip reason: Merged-In Ife2e098d1e55ed94efb2426505872546b27bc3bb with SHA-1 00329792 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21537186



Change-Id: I4a26f29ee53eb52186683dd77e3728508c7a550f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>