Merge "Fix TetheringServiceTest test WRITE_SETTINGS permission failure" am: 7e8b14abee am: b46dcf8317

Change-Id: I82825eeded51f779325291cc1142cb1d6111915b
tree: c2582a9d9f81bc661ac56cd56e763abf61eca99f
  1. Tethering/