Revert "Fix lingering merge fails"

This reverts commit 39f76e7f57d22db473f73fc4cb303e0efdf310b9.
Revert "Global Actions, Expanded Desktop framework Eos and CyanogenMod Profiles removed from global actions."

This reverts commit 94b541664c4f55c4344fcf27275568a29c2968b2.

Conflicts:
	core/java/android/view/IWindowManager.aidl

Change-Id: Ie2c994cae0f6235ea8e3f5d198e116f57a9e0991
Fix build @bigrushdog

Change-Id: Ia8b92d5fe48267c2313f4c09ce91237075dd25ca