This reverts commit 45ef9b6c01.
Reason for revert: As promised, sysUi changes introduced in Launcher for AppCloning are being reverted. (This is the only CL that was merged)
Change-Id: I9fc72c333d48ca51558578d0d79038b49b3ebb5b
Test: Manual by building sysUi