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

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