Merge "Drop cpuctl_device type from sepolicy"
am: 23719d9164

Change-Id: I892fb7b4a9b24fca50bbb93297efcb38c34fc054