[automerger skipped] Fix the issue deep shortcuts cannot be added to workspace via voice/switch access am: 39216c1533 -s ours
am: 3f2cc47303 -s ours
am skip reason: change_id Ie54d9c738fc51445f3aa49458ff4fc1dd6e4fc67 with SHA1 8a739f9511 is in history

Change-Id: I085984d4d887a8a89c4a163c53a365d91a85ae58