Revert "frameworks: set default expanded desktop style"

There's currently some funky behavior related to this. The power menu 
option gets automatically added to the power menu when entering 
"Display" settings, no matter what.

This reverts commit a0c3610e.

Change-Id: I958e0e6f92cb8b90485af96ad55c221214007336