Move DeviceUtil so slim actions work

Change-Id: Ib3f83ce0ada1a2f23511ed71f3eb07dc54a46c18
Merge "Move DeviceUtil so slim actions work" into lollipop