am e09c3fc7: (-s ours) am 0c8b18b9: (-s ours) am 126d4bc1: Give system server permission to enable and disable USB functions DO NOT MERGE

* commit 'e09c3fc7bdbbb05ff535852d6af3975ba5f23aee':
  Give system server permission to enable and disable USB functions DO NOT MERGE