Merge "Fix TetheringServiceTest test WRITE_SETTINGS permission failure"