Add CONTROL_PERMS for mmi-ril-daemon to allow cutback socket

Change-Id: Id598d0dc4cfa35ce1b6aefcc658407357da737ab
Fix order of entries in thermal-engine-8226

Change-Id: Idcef6bff14a0b36591d7bbb40e5306c4cd316a73
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0