Reverts ag/1803954 and ag/1828349 and left only split custom action

Test: manual - used Talkback
Fixes: 29360763
Change-Id: I50a5fd8fb438cba045ab4e86b4495af8a8fdf8f3
6 files changed