This reverts commit 106ff7a0a1. Test: All the unit tests (ShortcutManagerTest1*) CtsShortcutHostTestCases and CtsShortcutManagerTestCases Change-Id: Iadce2b3785cbf728daa60c4e2ff103e516d85896
106ff7a0a1
33ec106d22
377dab8ab3
fd737791e8