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

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