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

Change-Id: If9674488fca6833556733efc8fbda230b93e798a
tree: 5dcd99253741a16beae6c269058cfdc278dd2ee2
  1. Tethering/