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

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